effectively enable open sourced parts from previous commit