Fix bad merge

Well, this is embarrassing.

@ctsims can you review?