Undo some leftover changes from the earlier approach.