Revert "Merge pull request #46 from blegat/review_130424_use_models"

This reverts commit 917015088875d5342700d581a25218522cebeac2, reversing
changes made to 511285ac1cdead0cd62d0fe610268aaa4174f298.