Josh revert bad merges

This is to remove some problems w/ the last to merged pull requests, waiting for the solution to be fixed with a deep clone.