This reverts commit ce6204b, reversing
changes made to 904fcb4.