Revert to 07805eb6c