CON-1016

*DO NOT MERGE*
box-sizing again.