Synced with the source at 0130500acacc4b5391ac31546707e1e14c7aab30.