partially revert 7f48d7e