Reverted some previous changes