Revert "[merge] swgemu unstable branch 17AUG14"

This reverts commit 27c71feeb09edc65a2687367f969d108fd06de13.