This reverts commit 3dc1b79b3b, reversing changes made to 1dbafd8ba2. The previous merge of work on #665 broke the build so this commit reverts it back out.
3dc1b79b3b
1dbafd8ba2