BUG: Temporary backup

Fixes #3349