Remove unnecessary workaround code.