Revert "*more changes on CORE-1543"

This reverts commit 38e6140b2bb2feecf8b2bd0ad17e4b644c889bde.