removed legacy workaround