revert one of Ole's canges to get tests running