Revert "Back to the old school"

This reverts commit 01b9b59150f385af4cd4be1533773b4c27dc26e1.