This reverts commit 1c7673b9. Unfortunately, this one is broken because de04e6cd has been reverted.
mentioned in commit aac588ab