It's not clear why this code is in this commit?