Work around the fact that synthetic can only be used once

Change-Id: I16c7a7c00aa27aa69a81313e76c25cea87d709d9
Merge "Work around the fact that synthetic can only be used once" into production