[patch 1/2] Move code for [patch 2/2]