disable #171 for now, for performance reasons