Partially revert f7fadd11