Revert "fixes"

This reverts commit 0f42ebf069a0465950d8667c4f080142dac91975.