Revert 0562e3c..c95f4f3

This rolls back to commit 0562e3c7d5c56d265dd69cc1860eb081ad59ad3a.