revert 79ebdb5 for the time being #1110