Revert faa1826..e945ffd

This rolls back to commit faa1826cf72e73df4171395b4bccc443ef582635.