Reinstate old wrapper behaviour