Revert "Corrections for quest A Spirit Guide issue 4028"

This reverts commit 820fc057d65558272b2fb94edfc848c56eff6351.

Reverting commits in order to combine them