Revert "Fork friendly changes"

This reverts commit b5c6eb0a22ba5e0b7b26bc5081d4badb19edeb0c.