Removed no longer needed workaround