It was a mistake to add this change to master, it should only live in the pr3287 branch.

This reverts commit 132b022a.

Closes #2