Reverting a change causing issues on a cluster

Change-Id: Ib8bd62b8e95fdc9ffa7c05b4aed8b764bb9480dd
Merge "Reverting a change causing issues on a cluster"