Temporarily revert rust-layers, as the most recent change broke the acid2 test on mac/travis.
Merge pull request #3143 from glennw/revert-layers

Temporarily revert rust-layers, as the most recent change broke the acid2 test on mac/travis.