Revert 23acce5..cb95df7

This rolls back to commit 23acce56a30b575f0f7ceb1c6e3a81262a2369bf.