Issue #2448151 by Aleksander Belov, alesr, joelpittet: Speed up feature revertion of entity exportables