Revert "Start adding support for master version"

This reverts commit 05abde2842a599cda00a67e77091f284ec45bcc6.