ghost: Revert previous Sprint commits

Signed-off-by: Zhao Wei Liew <zhaoweiliew@gmail.com>