removing those mappings breaks rspecs.  i don't doubt things could work differently but i don't want to further stretch the scope of this PR :-)