58664af
Adjust the patch to pass test_archdirs(TestRbConfig). This is hopefuly better aligned with upstream intentions.