Depends on whether PUP-2379 gets accepted. :)