This reverts commit 0cee6744 Accidentally committed to wring repo, change and description does not make any sense here.
merged
mentioned in commit 3134bdb5