Partial revert of 658b014