revertme: temporary work for libhybris