With the slideshow branch merged, this needs to be updated/reverted.