This reverts commit 85f180ea. This should have been reverted on feature/stretch, as per: https://labs.riseup.net/code/issues/11962#note-15