Removing workaround code, probably not needed anymore.