Since this has changed, can we put a license header here?