Revert 202902e..f24996e

This rolls back to commit 202902eaad017ab086324d45ca8c98d6b499eba0.