Port to 1.7.2, temporarily removed some things, will return later.