Not sure we need to change anything, but the structure of this file doesn't really fit with most of the other code.