Revert PR #2577: Restore support for return in endpoint blocks
#2641
+14
−23
return in endpoint blocks
#2641