Revert ee7bb40..d8d3c57

This rolls back to commit ee7bb406bdc2f4dd2eca6bf399999406a4cbda8c.