Readded hacks to hide unwanted functionality.
Merge branch 'master' of https://github.com/mlaa/cbox-mla