Clone
Gary Hale
committed
on 20 Apr 18
Back out a few unnecessary changes