Revert 84696bf..f9c2784

This rolls back to commit 84696bf7c5c6a1e8c9753a2431047b5c7e66f7c3.