This reverts commit c374fb44f68dbb6a45ffea34551ffafe39f91e5f.
Quick switch, still may need some refacto and delete unused code