The #5755 code has been moved to #6443 (task-6443/) in commit de7426a.

