Revert b0ae6b8..6262a49

This rolls back to commit b0ae6b8f90102e32f498c3213e9701b855cce7c2.
6/7