TEST: This change should persist rebuilds