DEVELOPER-962

This partially reverts commit 5591f5b3aaa9e885f0084c67860eeafce668dc8c.