Revert ccb19a1..5eff3e7

This rolls back to commit ccb19a10967733fa49b9b6486df526037a4573b1.