Revert "damn fixes"

This reverts commit 1452e3d6729ed818863222a416ec254d6924a03d.