Removed hack in favor of putting it in library.

Signed-off-by: Jared Woolston <jwoolston@tenkiv.com>