Can't delete it yet as it's still used by legacy code :(