r22424: fixed the bad merge (thanks to metze for pointing out)