The lines 1803-1804 in commit 20d6d44 makes the if-statement always true, which I doubt was the intention. This part of the commit should either be reverted or fixed. The same fix needs to be applied to 2.1 master as well.