Revert "jacob muller suggested changes"

This reverts commit 5477a8e8c890efdb28f562c01ef5610936eb0567.