Revert ddaddb8..8498a6d

This rolls back to commit ddaddb8580ec99db1414185431d021ba9bfb5193.