Revert "Merge pull request #517 from mxfm/unabletoset"

This reverts commit 7df7e3043fdb139aa194dc0dfacaf42666dadd62, reversing
changes made to 73d3205773ab32e635afb83c29b5d709245a441d.