Revert "references #107"

This reverts commit a02011bc6fbaced4aeae843ca491e892d3ec4a92.

Dirty hacks aren't my style.