These three lines should be deleted before we merge this. (Just making a note.)