Revert to 6d1fe976