Stephane emailed me this to commit