Undo some boxen changes