Revert 9d4bb0c..3ad5290

This rolls back to commit 9d4bb0c773279cce0f275d25da86671a176c9cbf.
Revert 3ad5290..fb4a167

This rolls back to commit 3ad5290e333a89f9a4f1b905bac53bad546a1ee6.
9