Began life as a copy of #1033682