Commit 401da54 was accidently erased
Fixes #916