GitLab

Commit 81004dfa reverted the change
in 9b811fb6 when editing the merge
conflict from #2928.

This commit fixes that so that we don't make the same mistake again.

First seen in http://git.io/Cdaj5Q