remove workaround, no longer needed