Revert "More RBY stuff"

This reverts commit 41adffea8e5b0144ff0a4f64261a8b82e4040c51.