Revert 0f17660..a1e29ce

This rolls back to commit 0f1766053feb069daf49835197fec11a15f21fb5.
eff