Revert dab07e8..ab04b67

This rolls back to commit dab07e8b0647c43964f12f2af0a67d850926fb3d.