This reverts commit 8b47af8b, reversing changes made to c0055b3b.

Until we find a better solution?

cf !666 (merged)

closes #755 (closed)