Revert 28190d5..f0e9387

This rolls back to commit 28190d51e2ce39de884bfc90548cd322df3d4fa5.