This reverts commit 632d2617. I accdentally merged this instead of clicking the thumbs up button. My apologies. :(