1.8.7-friendly syntax
backed out action optimizations