Revert b9967a2..0733a54

This rolls back to commit b9967a2a6a595af90e2eb6a6a9a17157b6228dd1.
Sync Roll Back