Fair enough. In that case, I'll probably roll back #347 and postpone #357.