Repaired damage I did when merged into our fork from original repo