This commit was not cherry-picked from master because it is fixing an
incomplete backport. Commit 1e9e5ec in master was cherry-picked to
nautilus as 0be0fdf but part of the master commit was left out by mistake.
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>