Revert e2a6445..5c8b62b

This rolls back to commit e2a644587d99cc2dff8dcaf4f81a06c26683089d.