[misc] reverted some previous changes that were not supposed to be part of the commit.