Changed the behavior introduced in commit fb862a2894f01c5fb6144ec781f188445c13c7f1...