Revert e5950be..6826c81

This rolls back to commit e5950be9b24355dcf7a34e2300c4d8462f5e11f5.