Removed legacy workaround code