Reversion of 54594596
Merge pull request #791 from JamesGlover/revert_working_dilution_changes

Reversion of 54594596