Revert 51506ab..0652dfc

This rolls back to commit 51506ab874cc9a70effb60cc4c3eeb6564d3c0ee.
Merge branch 'SidneyFan' into version3.0