Revert "MVC 1 step"

This reverts commit f0b3a22d5966687bafee4f31a30704535e2e3f2f.