OK, let's do this in another bug if it's problematic in this stage.