Revert "minor changes"

This reverts commit 6eddd9beac8a7faa4131d78c6a2be0122b597cc1, reversing
changes made to 6e9c821b18ff1707b83152c897f3fcd8390d816c.