- By Benjamin. WIP bug 2887.