Revert 49014dd..0c86587

This rolls back to commit 49014dde9c28d1eb5378ce3a80855404d5851293.
MC_Alpha_41

Combined functionality from workspace session this morning.