This reverts commit 261e9ea227. Based on 2e79ca38f1, let's keep this for now given the differences should be reconciled. Signed-off-by: Sam James <sam@gentoo.org>
261e9ea227
2e79ca38f1