Reverting pull request to wrong branch.

This reverts commit d6b9b1c849807de31afd4ad3f2213ae233b454a8, reversing
changes made to b7998a88c4af5e61123e278b5f8b0ec5e2294da0.