I think this may be a relic of a botched merge (my fault...)