Reverted/fixed some incorrect changes.