The whatsit handling is actually much more similar to the old whatsit handling then the previous new one, so that part could be seen as a partial revert of the new whatsit handling... Anyway, whatsits work different than in the previous commit now.
