Partially revert 9a29ff4ce47df17b3a52e91c9cd4cbf955489660