This reverts commit edcad492e1. Patch is broken and breaking build; reverting until I have time to investigate. Reopens #701 Closes #889 Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>
edcad492e1