This reverts commit b847b45e, reversing
changes made to 9075a38f.
The reverted commmit has been done automatically, investigation is needed