re-apply a couple of changes that got reverted