Revert "Bug Fixes."

This reverts commit ce4522f177848e3aece0d079de9f578c33f1f963.