Revert "Better this way?"

This reverts commit 462fa25b94142a63f13868f7ec009121aa337f2f.