Fixes Trac ticket #27988