Revert to normal scheme