Should this be part of this commit?