Revert "Merge pull request #160 from laf/issue-159"

This reverts commit 59dfe4eee24630649a1b96b82cb55fb29e07a0b0, reversing
changes made to e6fa7d433d497abd0ffa56090eafda4630c96442.

This commit does not constitute agreement with the claim of copyright violation made by Adam Armstrong at
https://github.com/librenms/librenms/commit/59dfe4eee24630649a1b96b82cb55fb29e07a0b0
Revert "Merge pull request #158 from laf/issue-156"

This reverts commit e6fa7d433d497abd0ffa56090eafda4630c96442, reversing
changes made to e2280aa6030897b962147fb2dcb0ccc1a1ec590d.

This commit does not constitute agreement with the claim of copyright violation made by Adam Armstrong at
https://github.com/librenms/librenms/commit/e6fa7d433d497abd0ffa56090eafda4630c96442