This reverts commit 9a46153d8c43c4c3e606e364531bd3ba5a871737, which was aimed
at sidestepping se-edu/addressbook-level3#105. A better solution has been
identified which made the current fix redundant while introducing path issues
that are not obvious, see se-edu/addressbook-level3#111 for more details.