Following the discussion on pr #1030, we must decide whether or not we want to do this and implement it throughout the code (or not)
