Revert to no database pass