Reverted commit according to EranK's request.