Revert some fixes

Change-Id: Idb6b58206456b1eab8fb4204d2cca7ad1286ef15
Signed-off-by: Evan Anderson <evan1124@gmail.com>