Revert c40c0c3..2d35b80

This rolls back to commit c40c0c3df1e0a8bc8d9724c59f7a3ddabd79097a.