Revert "One last thing"

This reverts commit 336a9b054f1777a6bc3a700fb9489ef992e600f2.
Revert "Temp changes for testing purposes, DO NOT revert just yet!!!"

This reverts commit ad533d6712abef74418f8277dc8103a37037ce4e.