Revert "Tying something to fix the revert issues I ran into."

This reverts commit 7cc753c6deae4b7fa9ec43129252a34ccb95af6f.