Revert "Merge branch 'patch-1'"
Revert "Merge branch 'patch-1'"

This reverts commit e92b342d5cb7465b96a24b6f9b168bfc3a66988b, reversing
changes made to 48d97829a8777e00836391037f3444461e3312b9.

alexylem/jarvis,alexylem/jarvis,DipeshGhimire/Jarvis,alexylem/jarvis,DipeshGhimire/Jarvis