Began life as a copy of #1017355