This reverts commit 5b299241.
This reverts commit d029b594.
Hotfix/iphonex See merge request !56
This reverts commit 924d3a84
This reverts commit 2317447b