This one is not working either (committing it mostly to keep track of it in
the history).