This is useful, but I would prefer to make it optional / configurable later.