Your solution helped me find an easier method. The first few steps are the same however, instead of disabling Drive... go to:
-settings,
-apps,
-Drive,
then scroll down and click "Opens by default". Click the very top option - "Open supported links" and change it to "ask every time". Now...