Merge "Revert "Backing this one out since the counterpart needs to be sent upstream.""