Revert "Merge pull request #338 from skypanther/ALOY-800"

This reverts commit 1add1586f0bbcb4799e19edee1b4ff234220b26e, reversing
changes made to 06aed67e38c05302b84f6f9e306883459989fdf6.