Revert "Final Cloudforge RM"

This reverts commit af71f69d388a14db7f346a241b3442a1ed25f001.