Reverted previous change