Revert 192220 as it fails on an assertion