Revert "Changes to make it coexistable with the none dev version"

This reverts commit bc0cf47ac3a124d99a2650f607ccd9769e6b363a.
Version: 0.1.0.11 beta