Revert [c91be38ff8]: This breaks too many other assumptions right now