Revert examples causing test failures