Revert this crap....IS NOT THAT SERIOUS!!

This reverts commit 953f2bbdd33213c4173add8da4ce8b294a80a30e.

Change-Id: I9678313478b26950dc1c3efa329ca40f614ec340
Merge "Revert this crap....IS NOT THAT SERIOUS!!" into du44