Revert 630fa5c.