Reverted older changes