Jérôme Lacube's patch, version 11.
Cleanup previous patch.