Revert "Fix according to discussion with bill"

This reverts commit 8a8f19da207574ac979213678f916aeda09a58b8.