Revert 40e35a3..bcf2895

This rolls back to commit 40e35a3e9f6277f1758ab298e9e6394d152bed3a.