Revert 02bad5e..ee3ba92

This rolls back to commit 02bad5edb5e767d57121dffb0778b97c20b80fbf.