Revert "Merge branch 'master' into 0.4"

The change doesn't work properly and shouldn't be integrated in the
release branch, yet.

This reverts commit 8b555db46030a4b1c4df29c97e5152e22bfc1e4a, reversing
changes made to 603d4043ea10a46f0b25fa2f7a3bfc2eced2f644.