Revert "Issue 865"

Reverts mastercoin-MSC/omniwallet#935 to remove conflicts, updates are rolled in with #1036