Began life as a copy of #1031082