Revert 48346f8..629a016

This rolls back to commit 48346f8cbd9ac22a7debe67a9647970f0d888205.