WL-3293 Take 2