Revert d01251f..7fe66bd

This rolls back to commit d01251f58f387b2b56ae7f6676a9e2646ea4716a.
Revert eb1c565..2b9c978

This rolls back to commit eb1c565cfd53eacec10584444394d605afd34290.