Revert 80f91e0..7bcc892

This rolls back to commit 80f91e0217069a3f0d839f41174e05495203f2e1.