Reverted [4492] as it seems to be not any more necessary and it's causing issues with inline editing.
Changelog entry.
Merge branch 't/9940'