Revert 8f622ab..6ecb145

This rolls back to commit 8f622ab7c87fa193812be6a9506e795cd8c4dc8b.
Revert "minor changes"

This reverts commit 6ecb14549ce171d6867956523da6d09b3ed130c5.