Revert 73208e3..51620f9

This rolls back to commit 73208e360f5e8e242a03f648d6260d7685fcbe2d.