Revert "Commit PHOENIX-898 patch to 3.0"

This reverts commit 03641491271d2822246ec31b19850bcb507a281e.