Revert local changes and pull in r3828 from upstream.
Last remaining prototype issue that still hasn't been fixed upstream.