Synced with the source at f39a27aeab25b3d8780409201b00e097e462b348.