Revert 406c963..cb77926

This rolls back to commit 406c963c3c3a77a6bbc52219c0fe409fa66ae2f3.