Take 2
with new master.
bench: 8553907