Fixed Derp!

This reverts commit 87c0e5b1dfdb9b9ad4683a779fcd6add0e3ca2d0.

Change-Id: I58fc9b16a8c46f48a520517974d86fc331390bf0
Merge "Fixed Derp!" into jb4.2