Revert 8805072..b09a70a

This rolls back to commit 8805072d626618967e037e480b39af6621dee9ed.