Fix breakage due to John's recent changes