partially revert 48c8f61