MOB-346: Revert more stupid changes
Merge remote-tracking branch 'origin/MOB-346' into MOB-346