This code is probably useful to keep around. @raoulb did you add this?