Revert "Merge pull request #18 from Cadair/link_g+"

This reverts commit 1e8a70d1d1792c7ed96492ff8da44627ba9d7d6d, reversing
changes made to 29b805b4892d487605dfac136b7d5439e2a5f464.