Revert to 596f1f61