[#54316310] Switching to simpler (non-js) MC form