Bill, we should get an hRaven issue going to ublock fixing this. Do you think the issue should block us from merging this change?