CRAFTERCMS-384
Reverted changes added as resolution for CRAFTERCMS-351, because they are causing this issue
Merge remote-tracking branch 'dejan/master' into 2.2.3