Revert commit with toString -> instanceof changes