CRAFTERCMS-384

Reverted changes added as resolution for CRAFTERCMS-351, because they are causing this issue