This reverts commit d82d389a3d5b54d853017ea24331c07acff364f2.

The above commit was a stop-gap solution to ensure that the 7.5 build
on PB2 was not broken.

(Approved by Bala over IM)