Revert a2a7dd9..6badbd8

This rolls back to commit a2a7dd91b6b8f89e38a7f08bd9b411cd3decc5aa.