Selectively restore non-stupid parts of stuff we had
before a patented nuclear decrapificating

Change-Id: I679f5748365bb50451abc71398dcf35002282330
Merge "Selectively restore non-stupid parts of stuff we had before a patented nuclear decrapificating" into jb43