0.12.3dev: reverting r10892, we need to approach the problem differently (see #10530)
0.12.3dev: reverting r10892, we need to approach the problem differently (see #10530)

git-svn-id: 764b04d0c6fbbea0ee05220aef3208173ff13049@10922 af82e41b-90c4-0310-8c96-b1721e28e2e2

rbaumg/trac,rbaumg/trac,rbaumg/trac,rbaumg/trac