Revert baeb6a0..fa934eb

This rolls back to commit baeb6a0bc92cc769ca091d1b7e1b8e71eed5758d.