Revert some stylistic changes that costs us 50kb on Contacts