Note the comment below; something else breaks back compatibility.  So, need to think through that. :(