Fixes issue #2184
Removes workaround for issue #2184