Revert "'final proto for May 9th'"

This reverts commit 63e6234bbec67b4bd37bfc4bd1f559e07794a6a8.