Revert bad81e3..ee8cb83

This rolls back to commit bad81e34ce621278b6f8f07d79d38b6d848fc5a9.