Revert "DEVELOPER-358"

This reverts commit 9d483a0502cd68decc355f928f5ee8a21c33dc27.