This reverts commit 80852a4f. Test is now broken because underlying required patch was also reverted SUDDENLY.