Revert "Bury those beans"

This reverts commit d67bb55acf1468f1eadf93763840b429296482c5.

Conflicts:
	src/com/android/settings/DeviceInfoSettings.java
Re-order for OM