Commit 7528f94ca5b857811def86acaa58d6b07c703e00

Brandon Schaefer 2014-05-02T12:39:26

Remove code that found its way back into the diff