Removing conflicting lines of code for a broken merge into develop.