Fixed SCI-1019, revert accidental commit of experimental code