Prematurely merged before pulling. Fixing this now.

This reverts commit 8cd8277f58abe0392397538a01ee1486938577c9, reversing
changes made to bfd3c209d7cf0d29c87daff1f4b65776c003fd7e.