Began life as a copy of #1015563