Revert "Small upgrades"

This reverts commit ea5849a2901cd9d71413c08f850d465853bf27fd.