[ALOY-996] Roll back ALOY-858 changes
Merge pull request #379 from skypanther/ALOY-996

[ALOY-996] Roll back ALOY-858 changes