Reverted commit b53b8c7 which broke compound commands like "take pie then throw it at Moe" (Mantis 1395)