Revert "Merge pull request #14 from BlakeWu/bug-1009410-4.4.2_r1"

This reverts commit cbe5719bb7158a5e51af6afa416e423d1486a5a8, reversing
changes made to 9c6cb3231dd096df10a11b4d76be3727bdeec08d.