Correcting a merge error... will probably squash this once I know things are okay.