Revert "Finally fit for all hayabusa's and remove local temp file."

This reverts commit 2bcc91defaf98b3a2efa717b9ac0fcb4fc88ce3f.

Change-Id: I4732895cfa99945026cfca23bb526adbd6544772