ticket:7 Revert, fixes in t8_contact