revert code erroneously removed during resolving conflicts on previous merge with upcoming