Revert 749667f..68eca70

This rolls back to commit 749667f9a663fbd8446cdaed77761362faf57859.