MOB-510: Revert window to this in modil