Fix stupid compile error from bungled merge