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