Revert "Merge pull request #487 from Juniper/ut"

This reverts commit 18ccded9eab8da4a07efc8966fcb2d95456588ca, reversing
changes made to 90d70dbb5184d6bcc2c047c19f9aae09c10c3920.