Revert "Merge pull request #85 from Nordaaker/improvement/ping-pong"

This reverts commit 22d1fbebb721a62229e71baaeeaecf6560f5fd0e, reversing
changes made to a8fede26d2dab03b4e9ca986f88b6bfc4f41c134.