Fixed bad branch merge from f3293274