Reverted bashism removals from r228, after discussing this.