You can remove this method to get the (new) default behaviour.