Revert to the old way