Revert 02c58a4..d9aad8e

This rolls back to commit 02c58a4e6ac6b4e84b73b58226d8f21bf51f8480.