Temporarily roll back r181375 - it is causing an unexpected regression,
I'll revisit this and apply once I figure out how to address that.