Sync c1fe4b7 (it's failing on travis now).