XD-2201 1.0.x Back Port

Remove executor to avoid behavior change (tap running on different thread).