Revert 95d5f35..3efcfd0

This rolls back to commit 95d5f3540767e7fbaea05c9cb12ce90ddab5e677.
SMCP 6