Revert "I hope I didn't screw things up."

This reverts commit 8d80c5626a0c06ed662255a77b83fa6dcbf8493b.