Reverted previous changes that were unnecessary.