Revert "Fix #196"

#211 instead.