Revert bde5478..dcd27a3

This rolls back to commit bde5478b50f3b7ee6240419f17117e6d98749b28.
bess