Revert 312f9a3..70262e5

This rolls back to commit 312f9a3a8e52cf80bf98c48ad522cdfb4f306a86.