Remove the requirement of custom installer