Removing failed workaround
Fix for issue #1014