Revert it as maintainer wants to compile on ubuntu 16.04... I exclude kiriki from my list of apps that I will touch in the future This reverts commit 95f256a7.
