Revert to 6f0d76856c47