Revert e45bc90..d49ed29

This rolls back to commit e45bc90601692851ff30e8af35ddc2a5528abb26.