Revert "trog's fixes"

This reverts commit 15847c86dcdeab46337f94d2f844e0abcd64e79b.