Revert "v1.15"

This reverts commit e0f0f5c169529122439f3fb7dd9a1ad7956eff65.