Revert 84c58bf..1858f76

This rolls back to commit 84c58bf731b498714a848d923c31c32c951dce44.