Revert 8ea8a14..d9d8902

This rolls back to commit 8ea8a144a1f616e35e30bc55f5f97a31d99cc821.