i've pushed this since it passes snapshots/stage[123] -mike