Revert "Merge pull request #2087 from AndrewPodner/develop"

This reverts commit 16c26ff619d460228066e25ab2bc314925b85760, reversing
changes made to 72ed4c322652d88bf90ddfe8b8c9a563c51e4660.
Revert "Revert "Merge pull request #2087 from AndrewPodner/develop""

This reverts commit f0f832839461730c0779cd60329b4320d05d8c4d.