Removed temporary workaround