@darius I'd support keeping the current behavior