Remove the workaround code