Revert 3da0f22..9832b9b

This rolls back to commit 3da0f227e60206b7b9bcea626d75104b9930fa48.