Revert "Revert "Revert "Hmm"""

This reverts commit 75422b6ac88c5c74d5c17896fe8e5bae41224e67.