Revert 237ca0d..e6a7bb4

This rolls back to commit 237ca0d4aefea83a43e1001e13335d6bfa7e0aad.