This reverts part of commit 6ed384b827, in order to fix bug 26568. Bugfix on 0.3.4.1-alpha.
6ed384b827