Not sure if we can change this in 2.x as it surely breaks BC. @beberlei thoughts?