Fixed an accidental merge bug.