Compatibility with shower-0e985dd34b