revert workaround