Revert 379ecd1..c4da177

This rolls back to commit 379ecd15cfec23bba2998be0ac8d432295a9d1b3.