partial revert of de1714