Revert "I wanted to avoid this, but oh well."

This reverts commit 308adb13b311042acd8fec7db7480cbf8b68e2cd.
Well, time to use another of the new features.