Partially revert 0261f3009cef205c8c3ff79c2d4aaac317342b53