Undo changes for backwards compatibility