Derp merge deconflict error I made when merging master into dev-freeze.