Revert "Fix the build breakage caused by a bad merge resolution."

This reverts commit 5dd6699c3d6d65b300593dff9d16275a8f4933ae.
1 file changed