Revert 0f31efc..a9666e7

This rolls back to commit 0f31efc033c1aa9bad06ed250c04c05fa2866c0f.