Began life as a copy of #1030979