Revert "Just a temporary hack. Commiting so I can test it on a different machine."

This reverts commit 2e93a5977ffc56b46d4c87fb89b18bbb840cc93c.