Revert behavior change introduced in 2.14. This fixes issue 2.14.

Thanks @eleddy for following up on this.