Revert "Before rolling back"

This reverts commit 6290b998354ce890b25355ed7a5f1b41cbc440b6.