Revert 3903d83..713f79e

This rolls back to commit 3903d8356b0cf5ecda5af9b11e07bcc31bc005bd.
spoiler support