Switch to refactored version.