Revert "Merged Ghostrider fixes"

This reverts commit 9d65896e341585484dd8523a0bd11fc691709049.