Revert "Merge pull request #149 from OpenGamma/topic/PLAT-6692"

This reverts commit 5e8b293d81557b8c5ded2d65bd6c4384687e8f6f, reversing
changes made to e3c6ec0b2d0ec5bb71fbc51dd8259de76e956ba2.