locking notorm at commit bd5db46 for now; see http://tinyurl.com/a6swlwa