Revert "Merge"

This reverts commit b42a24c1aa3a44ff1c5117f723ce3670523ae5cf.

I hate this damn device