Revert "Make it work with in_current_dir"

This reverts commit 3c6c7862c302cb1adc8702f9cecb5880913745be.