Revert cb9cd35..f998db6

This rolls back to commit cb9cd35e2a3e361d6bf897a37a8dc7cf3fba7ea2.