Fixes #332, #327 and remove model facade

Reverted back to default, which is never.