revert a workaround