Revert 665fd33..2dde2f7

This rolls back to commit 665fd33ff38287c8a022c671dfe1850540c211f5.