Reverted changes from commit 059f2bc to 4d22658 because they corrupted scripts