Fixing bad merge in 972b629