Revert c307606..406f0d8

This rolls back to commit c30760686d2a9c8451e20a9344754b89f1f5d7d6.