Revert e8eb338..29d577f

This rolls back to commit e8eb3385fc4dbd833aa458635f4f6d85a5e9ed01.