Revert "set MVC"

This reverts commit bf98f0a77f3760ffe2f94b4cf9e351bc3ff6c54e.
Revert "Revert "set MVC""

This reverts commit 3b6e6af404febc9b10a16729c704347b327d9116.