Revert d0dd7f0..d35de41

This rolls back to commit d0dd7f02ef2f6f92f31aa603ae6596344a70677f.