CM-2036 Cleanup after backing out code
CM-2036 Cleanup after backing out code

rgeyer/rsc,rightscale/rsc,rightscale/rsc,rgeyer/rsc,rgeyer/rsc,rightscale/rsc,rightscale/rsc,rgeyer/rsc,rightscale/rsc,rgeyer/rsc