Synchronized with the source at 4743b11d74c6b6e04d99a981aa500f410d782bea.