Revert to 671c12f