Added conditional assembly to fold case for non original targets

Change-Id: I6d88086b259aef1d5190d71310a4c02ef0cb9fa6