If it ain't broke: break it

Change-Id: I4899851e32bf63c32250ecae0766cf62c131b142