Revert b0d6324..e083362

This rolls back to commit b0d6324dcd29f0cef6c0569b28fa10780d6d4d22.