Fixed incorrect merge from upstream.