Revert a17d3f7..fe1d4f3

This rolls back to commit a17d3f74d8b9eacaa435737fb5308accc778815a.