Revert e87f2cd..99edffe

This rolls back to commit e87f2cd4383b02c8d98edeeebb49f8d9a394ede7.