The problem with this is that all the tests scripts are going to have to change, et cetera, so I figured it could be done as a todo