Revert "DEVELOPER-530, DEVELOPER-531, DEVELOPER-532, DEVELOPER-533, DEVE...

...LOPER-534, DEVELOPER-535, DEVELOPER-536, DEVELOPER-538"

This partially reverts commit 5591f5b3aaa9e885f0084c67860eeafce668dc8c.