Revert "All over again"

This reverts commit 13e35c17f034eeefff5a441418f308e053802ea8.