merge fix: removed too many booleans... :p

Change-Id: Ic7dfd03cbe1d94b643875cdf08a1d1fe544f6db7