This reverts commit d04969d, reversing
changes made to 81cf9d5.