Revert "Revert "Revert 0996963..5912f8c""

This reverts commit 04ec7f11e240c9366b96f4934f5e214b5c381183.
Revert 6825ce1..bdb0b9c

This rolls back to commit 6825ce1dfdc2c6806c7e2667f1bed6b91b8bdf1f.