This reverts commit 38fe266ea9. The correct fix was pushed to the 10.4 branch (fbc157ab33)
38fe266ea9
fbc157ab33