Revert e3b9005..070b0b5

This rolls back to commit e3b9005ed6d52250b5c02b0a29825c34824e0a96.