This does the same thing, but simpler and faster.
Was noticed while investigating bug#12164555

Change-Id: If9926e4da8a53a65489da55197ac87122c44fe7c