Revert 3cb3e2a..94343e6

This rolls back to commit 3cb3e2af140f6c4d0fca10fcf06ea8bbcc24f42f.