A swift kick in the nards

This reverts commit f1096f9089ffbd427bf16522010bdd41dd3cb981.

Change-Id: Ifcc471cf8f77f314ae5c070d8d833efa41099f50