MWEB-995 deleted workaround--PLATFORM-308 fixed it

Revert "P2 "fix"; Backported from release-239"
This reverts commit eb526c0e24387f9b2002acc90d684bf3a6897920.