Revert "Work around 15097 - not fixed yet."

This reverts commit a3e977b925415c7f109788e1bedb46b7f46c03f6.