This reverts commit 77f40d75, reversing changes made to b969f464.
It turns out we did not have agreement on this after all.