Synchronized with the source at 7f4a16e03e2f87de46eeef96bc826edaf317a339.