Reverting 104384c (JIN-30)