Use nasty exec hack to avoid mount -> file dependency issues

Change-Id: Ia2df7d31c7470698a46c1c7ff62f1a6dee7368f0