Revert back to a supposedly-working state

This reverts commit 78777b0f8494a945b3179169eb55efe35f3ca3f8.