Revert bb6d041..f432e6e

This rolls back to commit bb6d0419d5775ed5f33102e7cf1854357e05cd6d.
Revert e014872..3a740f5

This rolls back to commit e0148729f87deb9c69adeb39672799c41310d74a.