Revert "Roll back"

This reverts commit 29504c09f263e73492c6ffecea201a81dcf3591d.