Revert "mild changes perhaps to the order of the things..."

This reverts commit 0dc2e788f21e47c93dfbbcc202fd4e6a370302bc.