Reverting temp fixes.
After resolving conflicts