Revert e066787..05bed83

This rolls back to commit e0667877490400cf442d7c6f2a6cc0acd107ee6c.