Revert "Merge pull request #2713 from cpradio/master"

This reverts commit a9de189682b0e0ec7c6b4209b4352d28c1a1e428, reversing
changes made to b7ab43e454683db208a177ecf48af294189a2321.