Synchronized with the source at 90082f2a9858750f12dee889b6574dded36c031d.