Screw canonical macros, altogether
Screw canonical macros, altogether

Reverts two earlier commits dealing with the macros.

freedesktop-unofficial-mirror/telepathy__telepathy-rakia,freedesktop-unofficial-mirror/telepathy__telepathy-rakia,freedesktop-unofficial-mirror/telepathy__telepathy-rakia