Revert a54fb35.
Revert a54fb35.

This was causing a problem and leading to #19. I need to properly test and
debug this prior to remerging this change.

viraptor/novm,google/novm,google/novm,viraptor/novm,nathanaelle/novm,nathanaelle/novm,google/novm,viraptor/novm,nathanaelle/novm,google/novm,nathanaelle/novm,viraptor/novm