Reverted needless Janeway changes.