Packaging for both Oculus Store *and* Vive

I’ve managed to get it to launch, but now because I’ve removed the SteamVR plugin and openvr_api.dll, to meet Oculus Store requirements, once I launch the .exe, it won’t load into my Oculus Rift CV1. I have pawn setup for auto possess, I also have Start in VR enabled. Using Oculus Branch of UE4 4.21. It works fine in 4.20.3… this is frustrating… any thoughts?