Undo @werdyl's fix-model push to master.