This reverts commit 727d626292. Sigh, although the SPR issue is complete the change hasn't been backported yet.
727d626292