Back to the old return value behavior
4.0.0