Undo breakage from last commit