Revert "Third time's the charm..."

This reverts commit 04e1a58b201202480856f1b5916a1df169e034aa.
Here we go again...