Revert 7b6bce0..c0e42ae

This rolls back to commit 7b6bce026c4174ec893a8fa5f413c480d86656fb.