Revert 0974998..cb013fa

This rolls back to commit 09749985aef8d20e086c7fbf7870069d1ad6ff0c.