Did not mean to commit/push the current state of master. But rather than mess up source control history with a force push, I'll just try to hurry to a stable point.