Take 2 at dev builds