Use CM Phone package again :)

And i hope we won't use custom anymore :)