This reverts commit f4b71ba, reversing
changes made to 4428f60.