Revert "Merge branch 'mvc5'"

This reverts commit 82b0a252a9c7bee7ea29bc250ebed98f81c607dc, reversing
changes made to c8a8bce13e4c80afdb8442079788b8445178f299.