Revert all the tunable crap.  Not for this build.  We will be keeping
the advanced device settings for now.
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: If562034686af0c31a268b544f33a80f0e115e9fd