Fixed something that was reverted a few commits back...