Began life as a copy of #1035656