Revert "Rollback"

This reverts commit 5b8928efef4399e967e26bc372b9769ea18d3f4c.