Re-added changes that got left behind in the repo breakout