Revert "Commit PHOENIX-898 patch to 4.0"

This reverts commit 1207882b6d5bc3000c148b8f892e7df4b5be391f.
Commit PHOENIX-907 patch to 4.0