Revert 0775183..ac22912

This rolls back to commit 0775183d87a2a14f5f867d4d51ecfb4b59a79a6f.
Merge branch 'bingggggg'