Revert "until i test it, goodbye"

I tested it. It's fine for now. Not as bad as i thought

This reverts commit bb4c9762d71cd09a6af1c24472df39e3aa4e92ac.

Change-Id: Ia67981680f895d6013bb176a95f042d8def800e7