Reverted previous changes