Revert d77c2bb..abbdfd7

This rolls back to commit d77c2bb8c83e6b310496b6eb7576d0a80e76c417.
rolled back