Revert e0152eb..ec29413

This rolls back to commit e0152eb85357830968d374821c7a3d1921c3dd52.