fix an error after resolving merge conflicts and remove some future
magic to get the build going again