Revert 3fa82d5..f0223f3

This rolls back to commit 3fa82d5ac9bb2eb17e3c219c55d1a4d070f9527e.