Revert back defaults, this module should concentrate on core stuff