Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev