Revert 2387909..92c5033

This rolls back to commit 2387909c45df9c5887076049393795dacd3d5f67.