Commented out patches that don't apply (https://trello.com/c/3jR7HJdZ)