This reverts commit b2d5307a44. Reason for revert: Bobcat uses 25+ version Change-Id: I589a5ae43ccf52104b8cbce327ab13248d3bbde0
b2d5307a44