Reverting back a few commits to see where the error is happening.