Restored merging mistake introduced in evil commit 666fc326c