Began life as a copy of #2000507