revert model.js and model_mixin.js to
348c8ba155fb28a3f638b84e9ea99636e68b0247
reverted all but necessary model changes