Towards normalization

diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index 2abcb9e..306beb3 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc

@@ -176,14 +176,6 @@
 
 /* Prepare */
 
-static inline hb_bool_t
-is_variation_selector (hb_codepoint_t unicode)
-{
-  return unlikely ((unicode >=  0x180B && unicode <=  0x180D) || /* MONGOLIAN FREE VARIATION SELECTOR ONE..THREE */
-		   (unicode >=  0xFE00 && unicode <=  0xFE0F) || /* VARIATION SELECTOR-1..16 */
-		   (unicode >= 0xE0100 && unicode <= 0xE01EF));  /* VARIATION SELECTOR-17..256 */
-}
-
 static void
 hb_set_unicode_props (hb_ot_shape_context_t *c)
 {
@@ -373,6 +365,8 @@
 
   hb_form_clusters (c);
 
+  _hb_normalize (c);
+
   hb_ot_shape_setup_masks (c); /* BUFFER: Clobbers var2 */
 
   /* SUBSTITUTE */