Reverting back to original motion classes