Revert e3af83b..f9f769c

This rolls back to commit e3af83ba7717f066059cd3ae46fd22c05ed8ec62.