Revert "topic/PLAT-6783b"

Reverts OpenGamma/OG-Platform#199