Unreviewed, rolling in r241237 again