This reverts commit b83bd804.
Looks like it was accidental..