Reverting to build structure for 139560b7 (to use in groovy catkwin ws)