Revert "Rollback"

This reverts commit 286a4fa6b0a236d743c09990da79a85119bd2570.