Revert r69291, other references-related problems reported