Revert 844c1e6..82db12d

This rolls back to commit 844c1e6128075669e64bf71f089f81cd4f9da863.