[css-text] Revert border/padding/+margin change, per Murakami's recommendation <http://lists.w3.org/Archives/Public/www-style/2014Jul/0424.html>