Revert destructive commits. Shit goes away

This brokes build scripts for some sony devices. I suggest reverting this commit like I did