Revert "Merge pull request #188 from donker/DNN-5743leupold"

This reverts commit 3143d2bb0f4d3c3d5bd6f1b0e039f72ce44b2cd8, reversing
changes made to 455499c0c96a4b07fb3867659e8ef2fa86a7f9c4.