This reverts commit 54225c45. The lack of RVO causes compile errors in our code. Reverting to unblock our integrate. See D145639 for full discussion.