By: md_5 <git@md-5.net>
Restores pre-1.13 behaviour. See linked ticket for further discussion. By: md_5 <git@md-5.net>