Temporarily reverting some commits on next that are still awaiting review.