Unreviewed, rolling out r190520, some tests assert / crash.