Temporarily revert 110737 and 110734, they were causing failures