Rolled back to scala 2.10