Revert back two mistakes..

This reverts commit 02cbce92715ab1ec645d027c1e99c09e2ce3a6ec.
Reverting some mistakes..

This reverts commit 1eb4f5bdaf065570d812acf04a3e1b09f8f2c8ce.