Revert a07271e..5eba492

This rolls back to commit a07271eff9e514493db8cc9ae9dce1cdf4c1b3ec.