/u/ZenRowe this should be an easy fix, though it could take a little time. These guys have already done the legwork for orionsun, can you help us make sure he gets the time to fix it please?
I have actually already raised the issue, and a discussion has begun on how best to handle it. There are a lot of potential fixes (some easy, some not), but many of them are high-impact and not likely to be implemented.
One thing that should be noted is that, while we want to prevent overlap conflicts like this: Homestead is not designed to work with S+ or be a mix & match system, it's one or the other. So any fix that may be implemented is likely going to continue following that stance.