Revert 8d81b08..cade491

This rolls back to commit 8d81b080eecb47f6f9d9ae31edbe616101effddc.