Should have deleted dead code instead of commenting it out.
Authored by: dannybackx 2019-01-06
Parent: [r153]
Child: [r155]