r13379: Andrew correctly noted that this breaks -s. Not sure what to do...