Revert "Fix build for MD 4.0"

This reverts commit a4fbd7d12c2f08732bb0dab6c5105e0aea310f38.
Since the current MD version is now 5.0 we don't need this
anymore.