Seeing issues when running with SAMZA-157, so reverting.

This reverts commit 3a6f2555aa92d47dd85b54f3f1503719c08d31a7.