Do we want to commit stuff like this?