Revert "Master becomes self upgradable"

This reverts commit 4d7958a4cc0e4e8f41726504bfaeef2d26227ae7.