Revert "Bug 997601 - Save the caller id preferece across reboots"

This reverts commit e57407520733fad1aea349613d647a4a313c1311.