This reverts commits 4ebd7a3d64 & 1970700ed6. These changes were committed to 'master' by accident.
4ebd7a3d64
1970700ed6