This commit is intended to be reverted before the branch is merged, and then reapplied after 0.14.0 is tagged.