RETURN to 1.8.4

Signed-off-by: Richard Lea <chigix@zoho.com>