Unreviewed, rolling in r243948 with test fix