Reverting last two commits (misidentified source of problems).