Revert to older code