Revert d21a73c..d7535e4

This rolls back to commit d21a73cc87148fdc7d93689076c3e4621adb3236.
Ignore workspace.xml