Revert "Not sure about this commit... might need to back this one out"

This reverts commit 08a359b6b6d8b3dd8e2c8d248ad77f7b68418e9a.