Readd all the things I reverted, bump version.

Change-Id: I549e9040d3bb78184b336a5f670d0836c66f198a
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>