Undo my undoing of @jcrossley3's change.