Revert 59b1875..cc078af

This rolls back to commit 59b18751651fc0f1e2e59cd6401e6e872f14ca23.