Revert d422d1a..15960c6
Revert d422d1a..15960c6

This rolls back to commit d422d1a61d3fd98de33b54b1a918055307290a18.

Kezuino/SMPT31,Kezuino/SMPT31,Kezuino/SMPT31,Kezuino/SMPT31,Kezuino/SMPT31,Kezuino/SMPT31