Turn the flag back on. This reverts commit c9f10b6be9. Change-Id: I1a77bdf7f59a6868fd8ab30687062f34fc914bc6
c9f10b6be9