This is a regression introduced in c12b8478, this commit simply brings back the previous behavior. Fixes #113 Part-of: <!185>