Revert df14b1f..e4ce0e6

This rolls back to commit df14b1faf01818b61e3a17da9c8977bd76e42c08.