Removed spurious if-statement introduced in last commit. For Ticket #129.