Revert "wanafon updates"

Reverts wanafon/patchwork#1