FIX: refactor https://gerrit.fd.io/r/#/c/1032