Revert "Far nicer"

This reverts commit 7e35d092998e450e4cc87a23169e6ed5f50c1a96.