This reverts commit f24c92c658 which is no longer necessary as SPR-16456 has no been fixed. See gh-11894
f24c92c658