Merge "Revert -Wunreachable-code workaround."