Any reason why you changed it back? (see https://github.com/RIOT-OS/RIOT/pull/535#issuecomment-34217779)