Revert "Roll back"

This reverts commit f4be1ab260d280c0df1f354267dfd3a8e2bfc9c3.