Revert cfc24d8..65ea6c6

This rolls back to commit cfc24d8b5b06d47e7ebe397336623f17a3dfee45.