Use upstream enhancements.