Fix for merge conflict that snuck through