Revert "Revert "Revert "Roll back"""

This reverts commit 4cd8d86181a223514fc7cd00d2b414245ecbc771.