Revert to Kates' unmerged commit