Revert 3f35a32..619442c

This rolls back to commit 3f35a3226419b080e933a4f7cb7483ff8f366881.