Partially revert 77b7ea5