This commit reverts using of lambda expressions, as we support Java 7 only at the moment.