Revert to cf6a9ab20