Revert 16807ab..f6a0f78

This rolls back to commit 16807ab3439ad2274ce409bc765a0959a3d122c9.