Revert to stored fields