Make absolutely sure we're in the right place when executing commands th...

Sorry, intended for 5-1-stable