Reverted some unnecessary changes.