Began life as a copy of #1025457